From bb36b2e439bffcaa7059e3c0578a0fc61c2737ac Mon Sep 17 00:00:00 2001
From: enkeii64 <imenkei64@gmail.com>
Date: Mon, 4 Aug 2025 17:59:44 +1000
Subject: Fix merge conflicts

---
 apps/web/src/app/editor/[project_id]/page.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'apps/web/src/app/editor/[project_id]')

diff --git a/apps/web/src/app/editor/[project_id]/page.tsx b/apps/web/src/app/editor/[project_id]/page.tsx
index f5e64a93..9e3d1b9e 100644
--- a/apps/web/src/app/editor/[project_id]/page.tsx
+++ b/apps/web/src/app/editor/[project_id]/page.tsx
@@ -155,7 +155,6 @@ export default function Editor() {
       <div className="h-screen w-screen flex flex-col bg-background overflow-hidden">
         <EditorHeader />
         <div className="flex-1 min-h-0 min-w-0">
-
           {activePreset === "media" ? (
             <ResizablePanelGroup
               key={`media-${activePreset}-${resetCounter}`}
@@ -301,7 +300,7 @@ export default function Editor() {
                 minSize={15}
                 maxSize={40}
                 onResize={setPropertiesPanel}
-                className="min-w-0"
+                className="min-w-0 rounded-sm"
               >
                 <PropertiesPanel />
               </ResizablePanel>
@@ -429,7 +428,7 @@ export default function Editor() {
                     minSize={15}
                     maxSize={40}
                     onResize={setPropertiesPanel}
-                    className="min-w-0"
+                    className="min-w-0 rounded-sm"
                   >
                     <PropertiesPanel />
                   </ResizablePanel>
-- 
cgit v1.3.1